Fix css parser tests

These tests were affected by the font and linear-gradient parsing
changes.

diff --git a/testsuite/css/parser/cross-fade-basic.css b/testsuite/css/parser/cross-fade-basic.css
index 8aa4aa48161353bdee8f385a3365188ec4929b9c..86b7293f61e30d850bbcc51348fab8c69490287b 100644 (file)
--- a/testsuite/css/parser/cross-fade-basic.css
+++ b/testsuite/css/parser/cross-fade-basic.css
@@ -1,15 +1,15 @@
 a {
-  background-image: cross-fade(linear-gradient(rgb(1,2,3)));
+  background-image: cross-fade(linear-gradient(rgb(1,2,3), rgb(1,2,3)), image(rgb(0,0,0)));
 }
 
 b {
-  background-image: cross-fade(0% linear-gradient(rgb(1,2,3)));
+  background-image: cross-fade(0% linear-gradient(rgb(1,2,3), rgb(1,2,3)), image(rgb(0,0,0)));
 }
 
 c {
-  background-image: cross-fade(100% linear-gradient(rgb(1,2,3)), linear-gradient(rgb(3,2,1)));
+  background-image: cross-fade(100% linear-gradient(rgb(1,2,3), rgb(1,2,3)), linear-gradient(rgb(3,2,1), rgb(3,2,1)));
 }
 
 d {
-  background-image: cross-fade(75% cross-fade(linear-gradient(rgb(1,2,3))), linear-gradient(rgb(3,2,1)));
+  background-image: cross-fade(75% cross-fade(linear-gradient(rgb(1,2,3), rgb(1,2,3))), linear-gradient(rgb(3,2,1), rgb(3,2,1)));
 }

diff --git a/testsuite/css/parser/declarations-valid-02.css b/testsuite/css/parser/declarations-valid-02.css
index 4cf729c335c4e9ad9f2d8de76b67f0ec4145217a..ebe10585ab2930abc18c39d6e68200ae6910c048 100644 (file)
--- a/testsuite/css/parser/declarations-valid-02.css
+++ b/testsuite/css/parser/declarations-valid-02.css
@@ -1 +1 @@
-* { font: Sans 15 }
+* { font: 15px Sans }

diff --git a/testsuite/css/parser/declarations-valid-02.ref.css b/testsuite/css/parser/declarations-valid-02.ref.css
index 4cafd4eafafdeafafb30a43d59e3c7a41d608837..53cc8e47be3a49696f1a34ab9cce0d902dff72b2 100644 (file)
--- a/testsuite/css/parser/declarations-valid-02.ref.css
+++ b/testsuite/css/parser/declarations-valid-02.ref.css
@@ -1,8 +1,8 @@
 * {
   font-family: "Sans";
   font-size: 15px;
-  font-stretch: normal;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
+  font-stretch: initial;
+  font-style: initial;
+  font-variant: initial;
+  font-weight: initial;
 }

diff --git a/testsuite/css/parser/declarations-valid-03.css b/testsuite/css/parser/declarations-valid-03.css
index 6d85fa83adb7e6de78dd3ff0376f383dfd884aeb..5e52ed7d1425fe98fbaca95a291818753d6a8e03 100644 (file)
--- a/testsuite/css/parser/declarations-valid-03.css
+++ b/testsuite/css/parser/declarations-valid-03.css
@@ -1 +1 @@
-* { font: Sans 15; }
+* { font: 15px Sans; }

diff --git a/testsuite/css/parser/declarations-valid-03.ref.css b/testsuite/css/parser/declarations-valid-03.ref.css
index 4cafd4eafafdeafafb30a43d59e3c7a41d608837..53cc8e47be3a49696f1a34ab9cce0d902dff72b2 100644 (file)
--- a/testsuite/css/parser/declarations-valid-03.ref.css
+++ b/testsuite/css/parser/declarations-valid-03.ref.css
@@ -1,8 +1,8 @@
 * {
   font-family: "Sans";
   font-size: 15px;
-  font-stretch: normal;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
+  font-stretch: initial;
+  font-style: initial;
+  font-variant: initial;
+  font-weight: initial;
 }

diff --git a/testsuite/css/parser/declarations-valid-04.css b/testsuite/css/parser/declarations-valid-04.css
index 41852c63c2d7a1f407da49f4d06e36ca8a6ed556..630d941455b5a8bfcd0e430859115043ad3a99ca 100644 (file)
--- a/testsuite/css/parser/declarations-valid-04.css
+++ b/testsuite/css/parser/declarations-valid-04.css
@@ -1 +1 @@
-* { font: bold }
+* { font: bold 15px sans }

diff --git a/testsuite/css/parser/declarations-valid-04.ref.css b/testsuite/css/parser/declarations-valid-04.ref.css
index 92389ab5eaf7445505857873d73664ee2e7d0a08..02daa1103bcf80146367f912da5e45423c42e71e 100644 (file)
--- a/testsuite/css/parser/declarations-valid-04.ref.css
+++ b/testsuite/css/parser/declarations-valid-04.ref.css
@@ -1,8 +1,8 @@
 * {
-  font-family: initial;
-  font-size: initial;
-  font-stretch: normal;
-  font-style: normal;
-  font-variant: normal;
+  font-family: "sans";
+  font-size: 15px;
+  font-stretch: initial;
+  font-style: initial;
+  font-variant: initial;
   font-weight: bold;
 }

diff --git a/testsuite/css/parser/declarations-valid-08.css b/testsuite/css/parser/declarations-valid-08.css
index 58a4c07bba89d498dad5b66656c1ffaa84382a41..a89205d44ebda28bbff613f12f15b7690ba43930 100644 (file)
--- a/testsuite/css/parser/declarations-valid-08.css
+++ b/testsuite/css/parser/declarations-valid-08.css
@@ -1 +1 @@
-* { font: /* comment here */ Sans 15 }
+* { font: /* comment here */ 15px Sans }

diff --git a/testsuite/css/parser/declarations-valid-08.ref.css b/testsuite/css/parser/declarations-valid-08.ref.css
index 4cafd4eafafdeafafb30a43d59e3c7a41d608837..53cc8e47be3a49696f1a34ab9cce0d902dff72b2 100644 (file)
--- a/testsuite/css/parser/declarations-valid-08.ref.css
+++ b/testsuite/css/parser/declarations-valid-08.ref.css
@@ -1,8 +1,8 @@
 * {
   font-family: "Sans";
   font-size: 15px;
-  font-stretch: normal;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
+  font-stretch: initial;
+  font-style: initial;
+  font-variant: initial;
+  font-weight: initial;
 }

diff --git a/testsuite/css/parser/declarations-valid-18.css b/testsuite/css/parser/declarations-valid-18.css
index 4688e0ca2ba87a6281da050e5a29e78ec6f6c168..d75aa584066a9dee51b30e2f8dad9ef18c190c30 100644 (file)
--- a/testsuite/css/parser/declarations-valid-18.css
+++ b/testsuite/css/parser/declarations-valid-18.css
@@ -1 +1 @@
-* { font: definitelydoesnotexist }
+* { font: 10pt definitelydoesnotexist }

diff --git a/testsuite/css/parser/declarations-valid-18.ref.css b/testsuite/css/parser/declarations-valid-18.ref.css
index 853a2cc93acffeb0fb6e9b3bd7b655c1759d84b6..7135a998b0570d1ec531a25c9ab66ec684c6a780 100644 (file)
--- a/testsuite/css/parser/declarations-valid-18.ref.css
+++ b/testsuite/css/parser/declarations-valid-18.ref.css
@@ -1,8 +1,8 @@
 * {
   font-family: "definitelydoesnotexist";
-  font-size: initial;
-  font-stretch: normal;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
+  font-size: 10pt;
+  font-stretch: initial;
+  font-style: initial;
+  font-variant: initial;
+  font-weight: initial;
 }

diff --git a/testsuite/css/parser/linear-gradient.css b/testsuite/css/parser/linear-gradient.css
index ea69573466b83c8c7e0946f695fc9e753ae4105a..91dc47432151537d00cca50d81a5655aaf70084a 100644 (file)
--- a/testsuite/css/parser/linear-gradient.css
+++ b/testsuite/css/parser/linear-gradient.css
@@ -1,71 +1,71 @@
 a {
-  background-image: linear-gradient(red);
-  border-image-source: repeating-linear-gradient(red);
+  background-image: linear-gradient(red, blue);
+  border-image-source: repeating-linear-gradient(red, blue);
 }
 
 b {
-  background-image: linear-gradient(to top, red);
-  border-image-source: repeating-linear-gradient(to top, red);
+  background-image: linear-gradient(to top, red, blue);
+  border-image-source: repeating-linear-gradient(to top, red, blue);
 }
 
 c {
-  background-image: linear-gradient(to bottom, red);
-  border-image-source: repeating-linear-gradient(to bottom, red);
+  background-image: linear-gradient(to bottom, red, blue);
+  border-image-source: repeating-linear-gradient(to bottom, red, blue);
 }
 
 d {
-  background-image: linear-gradient(to left, red);
-  border-image-source: repeating-linear-gradient(to left, red);
+  background-image: linear-gradient(to left, red, blue);
+  border-image-source: repeating-linear-gradient(to left, red, blue);
 }
 
 e {
-  background-image: linear-gradient(to right, red);
-  border-image-source: repeating-linear-gradient(to right, red);
+  background-image: linear-gradient(to right, red, blue);
+  border-image-source: repeating-linear-gradient(to right, red, blue);
 }
 
 f {
-  background-image: linear-gradient(to bottom left, red);
-  border-image-source: repeating-linear-gradient(to bottom left, red);
+  background-image: linear-gradient(to bottom left, red, blue);
+  border-image-source: repeating-linear-gradient(to bottom left, red, blue);
 }
 
 g {
-  background-image: linear-gradient(to right bottom, red);
-  border-image-source: repeating-linear-gradient(to right bottom, red);
+  background-image: linear-gradient(to right bottom, red, blue);
+  border-image-source: repeating-linear-gradient(to right bottom, red, blue);
 }
 
 h {
-  background-image: linear-gradient(to top right, red);
-  border-image-source: repeating-linear-gradient(to top right, red);
+  background-image: linear-gradient(to top right, red, blue);
+  border-image-source: repeating-linear-gradient(to top right, red, blue);
 }
 
 i {
-  background-image: linear-gradient(to left bottom, red);
-  border-image-source: repeating-linear-gradient(to left bottom, red);
+  background-image: linear-gradient(to left bottom, red, blue);
+  border-image-source: repeating-linear-gradient(to left bottom, red, blue);
 }
 
 j {
-  background-image: linear-gradient(1turn, red);
-  border-image-source: repeating-linear-gradient(1turn, red);
+  background-image: linear-gradient(1turn, red, blue);
+  border-image-source: repeating-linear-gradient(1turn, red, blue);
 }
 
 k {
-  background-image: linear-gradient(-0.25turn, red);
-  border-image-source: repeating-linear-gradient(-0.25turn, red);
+  background-image: linear-gradient(-0.25turn, red, blue);
+  border-image-source: repeating-linear-gradient(-0.25turn, red, blue);
 }
 
 l {
-  background-image: linear-gradient(3.125deg, red);
-  border-image-source: repeating-linear-gradient(3.125deg, red);
+  background-image: linear-gradient(3.125deg, red, blue);
+  border-image-source: repeating-linear-gradient(3.125deg, red, blue);
 }
 
 m {
-  background-image: linear-gradient(90.0rad, red);
-  border-image-source: repeating-linear-gradient(90.0rad, red);
+  background-image: linear-gradient(90.0rad, red, blue);
+  border-image-source: repeating-linear-gradient(90.0rad, red, blue);
 }
 
 n {
-  background-image: linear-gradient(-100grad, red);
-  border-image-source: repeating-linear-gradient(-100grad, red);
+  background-image: linear-gradient(-100grad, red, blue);
+  border-image-source: repeating-linear-gradient(-100grad, red, blue);
 }
 
 o {

diff --git a/testsuite/css/parser/linear-gradient.ref.css b/testsuite/css/parser/linear-gradient.ref.css
index 62b7fa76f7fd84bc16ac073b0c4aeba29acb9977..f20227dbcf19fadd3f03c557ec5df84d3beb5595 100644 (file)
--- a/testsuite/css/parser/linear-gradient.ref.css
+++ b/testsuite/css/parser/linear-gradient.ref.css
@@ -1,71 +1,71 @@
 a {
-  background-image: linear-gradient(rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(rgb(255,0,0));
+  background-image: linear-gradient(rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(rgb(255,0,0), rgb(0,0,255));
 }
 
 b {
-  background-image: linear-gradient(to top, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(to top, rgb(255,0,0));
+  background-image: linear-gradient(to top, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(to top, rgb(255,0,0), rgb(0,0,255));
 }
 
 c {
-  background-image: linear-gradient(rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(rgb(255,0,0));
+  background-image: linear-gradient(rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(rgb(255,0,0), rgb(0,0,255));
 }
 
 d {
-  background-image: linear-gradient(to left, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(to left, rgb(255,0,0));
+  background-image: linear-gradient(to left, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(to left, rgb(255,0,0), rgb(0,0,255));
 }
 
 e {
-  background-image: linear-gradient(to right, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(to right, rgb(255,0,0));
+  background-image: linear-gradient(to right, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(to right, rgb(255,0,0), rgb(0,0,255));
 }
 
 f {
-  background-image: linear-gradient(to bottom left, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(to bottom left, rgb(255,0,0));
+  background-image: linear-gradient(to bottom left, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(to bottom left, rgb(255,0,0), rgb(0,0,255));
 }
 
 g {
-  background-image: linear-gradient(to bottom right, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(to bottom right, rgb(255,0,0));
+  background-image: linear-gradient(to bottom right, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(to bottom right, rgb(255,0,0), rgb(0,0,255));
 }
 
 h {
-  background-image: linear-gradient(to top right, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(to top right, rgb(255,0,0));
+  background-image: linear-gradient(to top right, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(to top right, rgb(255,0,0), rgb(0,0,255));
 }
 
 i {
-  background-image: linear-gradient(to bottom left, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(to bottom left, rgb(255,0,0));
+  background-image: linear-gradient(to bottom left, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(to bottom left, rgb(255,0,0), rgb(0,0,255));
 }
 
 j {
-  background-image: linear-gradient(1turn, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(1turn, rgb(255,0,0));
+  background-image: linear-gradient(1turn, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(1turn, rgb(255,0,0), rgb(0,0,255));
 }
 
 k {
-  background-image: linear-gradient(-0.25turn, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(-0.25turn, rgb(255,0,0));
+  background-image: linear-gradient(-0.25turn, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(-0.25turn, rgb(255,0,0), rgb(0,0,255));
 }
 
 l {
-  background-image: linear-gradient(3.125deg, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(3.125deg, rgb(255,0,0));
+  background-image: linear-gradient(3.125deg, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(3.125deg, rgb(255,0,0), rgb(0,0,255));
 }
 
 m {
-  background-image: linear-gradient(90rad, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(90rad, rgb(255,0,0));
+  background-image: linear-gradient(90rad, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(90rad, rgb(255,0,0), rgb(0,0,255));
 }
 
 n {
-  background-image: linear-gradient(-100grad, rgb(255,0,0));
-  border-image-source: repeating-linear-gradient(-100grad, rgb(255,0,0));
+  background-image: linear-gradient(-100grad, rgb(255,0,0), rgb(0,0,255));
+  border-image-source: repeating-linear-gradient(-100grad, rgb(255,0,0), rgb(0,0,255));
 }
 
 o {